gbfile: Add support for reading UNICODE text files (using gbfgetstr).

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3445 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/gbfile.c b/gpsbabel/gbfile.c
index 73f76e7cb176c92330e295df6bf669c08bbde094..554c4b641909e7bc4ae9675834829c99fd154dc4 100644 (file)
--- a/gpsbabel/gbfile.c
+++ b/gpsbabel/gbfile.c
@@ -938,9 +938,17 @@ gbfunicode(gbfile *file)
                
                file->unicode_checked = 1;
                
+               c = gbfgetc(file);
+               if (c == EOF) return 0;
+               
+               if ((c != 0xFE) && (c != 0xFF)) {
+                       gbfungetc(c, file);
+                       return 0;
+               }
+               
                pos = gbftell(file);
                gbfrewind(file);
-               c = gbfgetc(file) | (gbfgetc(file) << 8);
+               c = c | (gbfgetc(file) << 8);
                
                if (c == 0xFEFF) file->big_endian = 0;
                else if (c == 0xFFFE) file->big_endian = 1;
@@ -948,6 +956,7 @@ gbfunicode(gbfile *file)
                        gbfseek(file, pos, SEEK_SET);
                        return 0;
                }
+
                file->unicode = 1;
                if (pos != 0) gbfseek(file, pos, SEEK_SET);
        }